Skip to content

copilot-verifier: Include in mainline copilot repo. Refs #622. - #628

Merged
ivanperez-keera merged 4 commits into
Copilot-Language:masterfrom
GaloisInc:develop-copilot-verifier-upstream
Jun 21, 2025
Merged

ivanperez-keera merged 4 commits into
Copilot-Language:masterfrom
GaloisInc:develop-copilot-verifier-upstream

Conversation

@RyanGlScott

Copy link
Copy Markdown
Collaborator

The copilot-verifier package was originally developed in an external repo (https://github.com/Copilot-Language/copilot-verifier), but there is interest in having all Copilot projects and libraries merged into the main https://github.com/Copilot-Language/copilot repo for ease of management.

This includes the last state of the old copilot-verifier repo into the main Copilot repo as a new subdirectory, disregarding the commit history. In a separate commit, this also adjusts the copilot-verifier changelog to make the old issues refer to copilot-verifier#<ISSUE_NUM> so that they are not interpreted as related to the main repo.

Fixes #622.

.

The `copilot-verifier` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-verifier), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

For now, we wish not to add `copilot-verifier` to the `cabal.project` file, as
its version bounds are tighter than the range of GHC versions that `copilot`
currently supports. As such, this commit explicitly lists the `.cabal` files of
packages that we do want to include in the `cabal.project`, i.e., all of the
`.cabal` files except for `copilot-verifier.cabal`.
…uage#622.

The `copilot-verifier` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-verifier), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

This commit includes the last state of the old `copilot-verified` repo into the
main Copilot repo as a new subdirectory, disregarding the commit history.
…guage#622.

The `copilot-verifier` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-verifier), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

Now that the `copilot-verifier` package lives in the `copilot` repo, this
adjusts the issue numbers in the `copilot-verifier` changelog to refer to the
old repo so that they will not be confused with issues in the `copilot` repo.
@RyanGlScott
RyanGlScott force-pushed the develop-copilot-verifier-upstream branch from 5adba64 to 9e0dcac Compare June 20, 2025 14:48
@ivanperez-keera

ivanperez-keera commented Jun 21, 2025 •

Copy link
Copy Markdown
Member

Change Manager: Verified that:

  • Solution is implemented:
    • The code proposed compiles and passes all tests. Details:
      Build log: https://app.travis-ci.com/github/Copilot-Language/copilot/builds/275542308
    • The solution proposed produces the expected result. Details:
      The following dockerfile checks out the latest version of copilot-verifier, v4.4, and compares it against the version being merged, ignoring differences in the CHANGELOG (which is expected to be different), checking that there are no other differences, after which it prints the message "Success":
      FROM ubuntu:noble
      
      ENV DEBIAN_FRONTEND=noninteractive
      RUN apt-get update
      
      RUN apt-get install --yes git
      RUN git config --global advice.detachedHead false
      
      CMD git clone $REPO $NAME \
          && cd $NAME \
          && git checkout $COMMIT \
          && cd .. \
          && git clone -b v4.4 https://github.com/Copilot-Language/copilot-verifier copilot-verifier-original \
          && diff --exclude 'CHANGELOG' -r $NAME/copilot-verifier copilot-verifier-original/copilot-verifier \
          && echo "Success"
      Command (substitute variables based on new path after merge):
      $ docker run -e REPO=https://github.com/GaloisInc/copilot-1 -e NAME=copilot -e COMMIT=9e0dcac323f523277b1bdcb74869d823b6ad5324 copilot-verify-622
      
  • Implementation is documented. Details:
    CHANGELOG updated to make old issues point to original repo. No other changes needed.
  • Change history is clear.
  • Commit messages are clear.
  • Changelogs are updated.
  • Examples are updated. Details:
    No updates needed.
  • Required version bumps are evaluated. Details:
    Bump not needed; change includes existing package without affecting API.

@ivanperez-keera
ivanperez-keera merged commit 894f0aa into Copilot-Language:master Jun 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

copilot-verifier: Include in mainline

2 participants